Revision: tla--devo--1.4--patch-5
Archive: lord@emf.net--gnu-arch-2004
Creator: Matthew Dempsky <mdempsky@seyza.com>
Date: Fri Jan  7 07:21:42 UTC 2005
Standard-date: 2005-01-07 07:21:42 GMT
Modified-files: =merges PLUGIN/options libarch/Makefile.in
    libarch/ancestry.c libarch/ancestry.h
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/arbdelta.c libarch/arbdelta.h
    libarch/archive-cache.c libarch/archive-cache.h
    libarch/archive-mirror.c libarch/archive-mirror.h
    libarch/archive-pfs.c libarch/archive-pfs.h
    libarch/archive-setup.c libarch/archive-setup.h
    libarch/archive-snapshot.c libarch/archive-snapshot.h
    libarch/archive-version.c libarch/archive.c
    libarch/archive.h libarch/archives.c libarch/archives.h
    libarch/build-revision.c libarch/build-revision.h
    libarch/cached-inventory.c libarch/cached-inventory.h
    libarch/changelogs.c libarch/changeset-report.c
    libarch/changeset-report.h libarch/changeset-utils.c
    libarch/changeset-utils.h libarch/chatter.c
    libarch/cmd-abrowse.c libarch/cmd-add-id.c
    libarch/cmd-add-log-version.c
    libarch/cmd-add-pristine.c libarch/cmd-ancestry-graph.c
    libarch/cmd-ancestry.c libarch/cmd-apply-changeset.c
    libarch/cmd-apply-delta.c libarch/cmd-archive-fixup.c
    libarch/cmd-archive-meta-info.c
    libarch/cmd-archive-mirror.c
    libarch/cmd-archive-setup.c
    libarch/cmd-archive-snapshot.c
    libarch/cmd-archive-version.c libarch/cmd-archives.c
    libarch/cmd-branches.c libarch/cmd-build-config.c
    libarch/cmd-cachedrevs.c libarch/cmd-cacherev.c
    libarch/cmd-cat-archive-log.c libarch/cmd-cat-config.c
    libarch/cmd-cat-log.c libarch/cmd-categories.c
    libarch/cmd-changelog.c libarch/cmd-changes.c
    libarch/cmd-changeset.c libarch/cmd-commit.c
    libarch/cmd-default-id.c libarch/cmd-delete-id.c
    libarch/cmd-delta.c libarch/cmd-escape.c
    libarch/cmd-file-diff.c libarch/cmd-file-find.c
    libarch/cmd-find-pristine.c libarch/cmd-get-changeset.c
    libarch/cmd-get.c libarch/cmd-grab.c libarch/cmd-help.c
    libarch/cmd-id-tagging-defaults.c
    libarch/cmd-id-tagging-method.c libarch/cmd-id.c
    libarch/cmd-import.c libarch/cmd-init-tree.c
    libarch/cmd-inventory.c libarch/cmd-join-branch.c
    libarch/cmd-library-add.c
    libarch/cmd-library-archives.c
    libarch/cmd-library-branches.c
    libarch/cmd-library-categories.c
    libarch/cmd-library-config.c libarch/cmd-library-file.c
    libarch/cmd-library-find.c libarch/cmd-library-log.c
    libarch/cmd-library-remove.c
    libarch/cmd-library-revisions.c
    libarch/cmd-library-versions.c
    libarch/cmd-lock-pristine.c libarch/cmd-lock-revision.c
    libarch/cmd-log-for-merge.c libarch/cmd-log-versions.c
    libarch/cmd-logs.c libarch/cmd-make-archive.c
    libarch/cmd-make-branch.c libarch/cmd-make-category.c
    libarch/cmd-make-log.c libarch/cmd-make-version.c
    libarch/cmd-merges.c libarch/cmd-missing.c
    libarch/cmd-move-id.c libarch/cmd-mv.c
    libarch/cmd-my-default-archive.c libarch/cmd-my-id.c
    libarch/cmd-my-revision-library.c
    libarch/cmd-new-merges.c
    libarch/cmd-parse-package-name.c
    libarch/cmd-pristines.c libarch/cmd-rbrowse.c
    libarch/cmd-redo.c libarch/cmd-register-archive.c
    libarch/cmd-remove-log-version.c libarch/cmd-replay.c
    libarch/cmd-revisions.c libarch/cmd-rm.c
    libarch/cmd-set-tree-version.c
    libarch/cmd-show-changeset.c libarch/cmd-star-merge.c
    libarch/cmd-sync-tree.c libarch/cmd-tag.c
    libarch/cmd-tree-lint.c libarch/cmd-tree-root.c
    libarch/cmd-tree-version.c libarch/cmd-uncacherev.c
    libarch/cmd-undo.c libarch/cmd-update.c
    libarch/cmd-valid-package-name.c libarch/cmd-versions.c
    libarch/cmd-whereis-archive.c libarch/cmd.c
    libarch/cmd.h libarch/cmds.c libarch/cmdutils.c
    libarch/cmdutils.h libarch/commit.c libarch/commit.h
    libarch/configs.c libarch/configs.h
    libarch/copy-project-tree.c libarch/diffs.c
    libarch/diffs.h libarch/editor.c libarch/exec.c
    libarch/file-diffs.c libarch/hooks.c libarch/import.c
    libarch/import.h libarch/inode-sig.c libarch/inode-sig.h
    libarch/inv-ids.c libarch/inv-ids.h libarch/invent.c
    libarch/invent.h libarch/libraries.c libarch/libraries.h
    libarch/library-txn.c libarch/library-txn.h
    libarch/local-cache.c libarch/local-cache.h
    libarch/make-changeset-files.c
    libarch/make-changeset-files.h libarch/make-changeset.c
    libarch/make-changeset.h libarch/merge-points.c
    libarch/merge-points.h libarch/missing.c
    libarch/missing.h libarch/my.c libarch/my.h
    libarch/namespace.c libarch/namespace.h
    libarch/patch-logs.c libarch/patch-logs.h
    libarch/pfs-dav.c libarch/pfs-dav.h libarch/pfs-fs.c
    libarch/pfs-fs.h libarch/pfs-ftp.c libarch/pfs-ftp.h
    libarch/pfs-sftp.c libarch/pfs-sftp.h
    libarch/pfs-signatures.c libarch/pfs-signatures.h
    libarch/pfs.c libarch/pfs.h libarch/pristines.c
    libarch/pristines.h libarch/proj-tree-lint.c
    libarch/proj-tree-lint.h libarch/project-tree.c
    libarch/replay.c libarch/replay.h libarch/star-merge.c
    libarch/star-merge.h libarch/sync-tree.c
    libarch/sync-tree.h libarch/tag.c libarch/undo.c
    libarch/whats-new.c libarch/whats-new.h
    libawk/Makefile.in libawk/associative.c libawk/numbers.c
    libawk/relassoc.c libawk/relassoc.h libawk/relational.c
    libawk/trim.c libdate/Makefile.in libdate/date-string.c
    libfsutils/Makefile.in libfsutils/copy-file.c
    libfsutils/copy-file.h libfsutils/dir-as-cwd.c
    libfsutils/dir-listing.c libfsutils/dir-listing.h
    libfsutils/ensure-dir.c libfsutils/file-contents.c
    libfsutils/find-utils.c libfsutils/find-utils.h
    libfsutils/link-target.c libfsutils/link-tree.c
    libfsutils/link-tree.h libfsutils/read-line.c
    libfsutils/rmrf.c libfsutils/safety.c libfsutils/same.c
    libfsutils/string-files.c libfsutils/tmp-files.c
    tla/Makefile.in tla/tla.c
New-patches: lord@emf.net--gnu-arch-2004/tla--devo--1.4--patch-5
Summary: make the #include statements more baz friendly
Keywords: 

Because of the name change, baz is now developed in a different directory
and due to the way package-framework sets include directories by default,
this would cause a large amount of patch conflicts when merging back and
forth.

This patch uses a little work around by modifying EXTRA_CFLAGS to include
the 'tla' or 'baz' (as appropriate) subdirectories in the include path
along with modifying all of the #include statements where necessary.
